From b2a8e6ed047db0b306945753e53a534affacd82b Mon Sep 17 00:00:00 2001 From: John Ralls Date: Thu, 1 Mar 2012 12:08:57 -0800 Subject: [PATCH] Fix compile error from splitting bitmask code GtkBitMask was typedef'd twice. --- gtk/gtkbitmaskprivate.h | 4 +--- gtk/gtkbitmaskprivateimpl.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/gtk/gtkbitmaskprivate.h b/gtk/gtkbitmaskprivate.h index 5e61c3c70c..4a255efa26 100644 --- a/gtk/gtkbitmaskprivate.h +++ b/gtk/gtkbitmaskprivate.h @@ -21,12 +21,10 @@ #define __GTK_BITMASK_PRIVATE_H__ #include +#include "gtkallocatedbitmaskprivate.h" G_BEGIN_DECLS -typedef struct _GtkBitmask GtkBitmask; - - static inline GtkBitmask * _gtk_bitmask_new (void); static inline GtkBitmask * _gtk_bitmask_copy (const GtkBitmask *mask); static inline void _gtk_bitmask_free (GtkBitmask *mask); diff --git a/gtk/gtkbitmaskprivateimpl.h b/gtk/gtkbitmaskprivateimpl.h index e678a81d44..0dea65abe7 100644 --- a/gtk/gtkbitmaskprivateimpl.h +++ b/gtk/gtkbitmaskprivateimpl.h @@ -18,7 +18,6 @@ * Authors: Benjamin Otte */ -#include "gtkallocatedbitmaskprivate.h" static inline GtkBitmask * _gtk_bitmask_new (void) -- 2.30.2